Skip to content

Conversation

@reddevilmidzy
Copy link
Contributor

Note

Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of #133895

removed directory tests/ui/explicit, tests/ui/interior-mutability, tests/ui/invalid-module-declaration, tests/ui/invalid-self-argument`

r? Kivooeo

@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2025

This PR modifies tests/ui/issues/. If this PR is adding new tests to tests/ui/issues/,
please refrain from doing so, and instead add it to more descriptive subdirectories.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 30, 2025
Comment on lines +24 to +38
struct Bar<'a> {
data: &'a [u8],
}

impl<'a> Bar<'a> {
fn bar(self: &mut Bar) {
//~^ ERROR mismatched `self` parameter type
//~| NOTE expected struct `Bar<'a>`
//~| NOTE found struct `Bar<'_>`
//~| NOTE lifetime mismatch
//~| ERROR mismatched `self` parameter type
//~| NOTE expected struct `Bar<'a>`
//~| NOTE found struct `Bar<'_>`
//~| NOTE lifetime mismatch
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merged tests/ui/issues/issue-17740.rs with tests/ui/lifetimes/explicit-self-lifetime-mismatch.rs to organize them. Is that okay? If you think it's unnecessary, I'll revert it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, no need to revert, moving tests out of tests/ui/issues is always welcome, this directory is a total mess and must be removed as a long term plan (there is 500+ tests remains or something, haven't visited this one for a while)

@rust-log-analyzer

This comment has been minimized.

@Kivooeo
Copy link
Member

Kivooeo commented Nov 30, 2025

Quick update: From around Dec 2nd, I'll be offline for about a week due to a hospital stay (all fine!). After I return, responses may be delayed as I'm juggling my medical studies and a job search

So, if you're fine with waiting until I return, feel free to assign PRs to me. I'll review them after I'm back

tests/ui/invalid-module-declaration/invalid-module-declaration.rs duplicated of tests/ui/modules/missing_non_modrs_mod_inline.rs
@reddevilmidzy
Copy link
Contributor Author

@Kivooeo I wish you a smooth recovery and the best of luck with your job search! I don't want to place any extra burden on you, so I'll find a different, random reviewer for next PRs. Thank you very much for your reviews during this time:)

@Kivooeo
Copy link
Member

Kivooeo commented Dec 1, 2025

Forget to say, but as you moved this interior mutability test to traits directory, feel free to squash

fix explicit-call-to-dtor.rs
fix explicit-call-to-supertrait-dtor.rs
merge issues/issue-17740.rs with lifetimes/explicit-self-lifetime-mismatch.rs
merge bare-fn-start.rs and trait-fn.rs into invalid-self-argument.rs
add comment tests/ui/traits/catch-unwind-cell-interior-mut
@Kivooeo
Copy link
Member

Kivooeo commented Dec 1, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 1, 2025

📌 Commit a4a7950 has been approved by Kivooeo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2025
bors added a commit that referenced this pull request Dec 1, 2025
Rollup of 6 pull requests

Successful merges:

 - #149393 (expand valid edition range for use-path-segment-kw.rs)
 - #149427 (Make the capitalization explicit on keyword misspell error)
 - #149433 (Use a delayed bug for this layout ICE)
 - #149473 (Tidying up UI tests [7/N])
 - #149505 (Update the comment in the add_typo_suggestion function)
 - #149513 (`rust-analyzer` subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c91942b into rust-lang:main Dec 1, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Dec 1, 2025
rust-timer added a commit that referenced this pull request Dec 1, 2025
Rollup merge of #149473 - reddevilmidzy:t7, r=Kivooeo

Tidying up UI tests [7/N]

> [!NOTE]
> Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of #133895

removed directory  `tests/ui/explicit`,  `tests/ui/interior-mutability`, `tests/ui/invalid-module-declaration`, tests/ui/invalid-self-argument`

r? Kivooeo
@reddevilmidzy reddevilmidzy deleted the t7 branch December 2, 2025 02:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants